(rmail-cease-edit): Add additional quotes to quoted From lines.

diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index 79091200eee14564d193fb26b0237cbbae21f51e..1c0d63b5aef86098f4a0532b5bbe622955db7e96 100644 (file)
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -112,9 +112,10 @@ This functions runs the normal hook `rmail-edit-mode-hook'.
   ;; Disguise any "From " lines so they don't start a new message.
   (save-excursion
     (goto-char (point-min))
-    (while (search-forward "\nFrom " nil t)
+    (while (re-search-forward "^>*From " nil t)
       (beginning-of-line)
-      (insert ">")))
+      (insert ">")
+      (forward-line)))
   ;; Make sure buffer ends with a blank line
   ;; so as not to run this message together with the following one.
   (save-excursion